Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 26 Jan 2012 15:49:37 +0000 (07:49 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 26 Jan 2012 15:49:37 +0000 (07:49 -0800)
commit22308b92b07278edce8e5dcbcde03254d4303fe8
tree85f40df31223a76a90fe4916dfc181e142504526
parent9ea89239b333e6596fb864d6ac90e4ece5487c66
parent177e278a8befdbd43277a65e17ed5870a7a03173
Merge from trunk.